Linux Cubed Series 7: Sunsite

home *** CD-ROM | disk | FTP | other *** search

/ Linux Cubed Series 7: Sunsite / Linux Cubed Series 7 - Sunsite Vol 1.iso / system / network / samba / patches / samba-1.004 / samba-1

Wrap

Text File | 1996-05-29 | 97.7 KB | 3,310 lines

diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/README samba-1.9.16alpha2/README --- samba-1.9.16alpha1/README Mon Dec 4 00:35:25 1995 +++ samba-1.9.16alpha2/README Tue May 28 23:37:21 1996 @@ -35,7 +35,8 @@ If you want to contribute to the development of the software then please join the mailing list. I accept patches (preferably in -"diff -u" format) and am always glad to receive feedback or suggestions. +"diff -u" format, see docs/BUGS.txt for more details) and am always glad to +receive feedback or suggestions. You could also send hardware/software/money/jewelry or pizza vouchers directly to me. The pizza vouchers would be especially @@ -49,7 +50,7 @@ something else. Andrew Tridgell -Email: samba-bugs@anu.edu.au +Email: samba-bugs@samba.anu.edu.au 3 Ballow Crescent Macgregor, A.C.T. @@ -70,18 +71,18 @@ -------- The main anonymous ftp distribution site for this software is -nimbus.anu.edu.au in the directory pub/tridge/samba/. +samba.anu.edu.au in the directory pub/samba/. MAILING LIST ------------ There is a mailing list for discussion of Samba. To subscribe send -mail to listproc@anu.edu.au with a body of "subscribe samba Your Name" +mail to listproc@samba.anu.edu.au with a body of "subscribe samba Your Name" To send mail to everyone on the list mail to samba@listproc.anu.edu.au There is also an announcement mailing list where I announce new -versions. To subscribe send mail to listproc@anu.edu.au with a body +versions. To subscribe send mail to listproc@samba.anu.edu.au with a body of "subscribe samba-announce Your Name". All announcements also go to the samba list. @@ -102,7 +103,11 @@ A Samba WWW site has been setup with lots of useful info. Connect to: -http://lake.canberra.edu.au/pub/samba/ +http://samba.canberra.edu.au/pub/samba/ + +As well as general information and documentation, this also has searchable +archives of the mailing list and a user survey that shows who else is using +this package. Have you registered with the survey yet? :-) It is maintained by Paul Blackman (thanks Paul!). You can contact him at ictinus@lake.canberra.edu.au. diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/BUGS.txt samba-1.9.16alpha2/docs/BUGS.txt --- samba-1.9.16alpha1/docs/BUGS.txt Mon Nov 27 10:55:31 1995 +++ samba-1.9.16alpha2/docs/BUGS.txt Tue May 28 23:37:22 1996 @@ -2,10 +2,6 @@ >> The email address for bug reports is samba-bugs@anu.edu.au << -(NOTE: This mail may not be in place yet. If you have troubles with it -then use samba-bugs@arvidsjaur.anu.edu.au) - - Please take the time to read this file before you submit a bug report. Also, please see if it has changed between releases, as I may be changing the bug reporting mechanism sometime soon. @@ -17,15 +13,14 @@ report that lets me fix it fast. Do not assume that if you post the bug to the comp.protocols.smb -newsgroup that I will read it. I do read all postings to the samba -mailing list (see the README). If you suspect that your problem is not -a bug but a configuration problem then it is better to send it to the -Samba mailing list, as there are (at last count) 1900 other users on +newsgroup or the mailing list that I will read it. If you suspect that your +problem is not a bug but a configuration problem then it is better to send +it to the Samba mailing list, as there are (at last count) 1900 other users on that list that may be able to help you. You may also like to look though the recent mailing list archives, which are conveniently accessible on the Samba web pages -at http://lake.canberra.edu.au/pub/samba/ +at http://samba.canberra.edu.au/pub/samba/ GENERAL INFO @@ -35,6 +30,8 @@ errors. Look in your log files for obvious messages that tell you that you've misconfigured something and run testparm to test your config file for correct syntax. + +Have you run through DIAGNOSIS.txt? This is very important. If you include part of a log file with your bug report then be sure to annotate it with exactly what you were doing on the client at the diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/DIAGNOSIS.txt samba-1.9.16alpha2/docs/DIAGNOSIS.txt --- samba-1.9.16alpha1/docs/DIAGNOSIS.txt Mon Nov 27 10:55:31 1995 +++ samba-1.9.16alpha2/docs/DIAGNOSIS.txt Tue May 28 23:37:23 1996 @@ -86,7 +86,13 @@ connection. If it says "your server software is being unfriendly" then its probably because you have invalid command line parameters to smbd, or a similar fatal problem with the initial startup of smbd. Also -check your config file for syntax errors with "testparm". +check your config file for syntax errors with "testparm". + +Another common cause of these two errors is having something already running +on port 139, such as Samba (ie smbd is running from inetd already) or something +like Digital's Pathworks. Check your inetd.conf file before trying to start +smbd as a daemon, it can avoid a lot of frustration! + TEST 4: ------- diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/HINTS.txt samba-1.9.16alpha2/docs/HINTS.txt --- samba-1.9.16alpha1/docs/HINTS.txt Mon Nov 27 10:55:31 1995 +++ samba-1.9.16alpha2/docs/HINTS.txt Tue May 28 23:37:23 1996 @@ -40,7 +40,7 @@ windows. Just drag your file onto the icon and it converts the file. Get it from -ftp://nimbus.anu.edu.au/pub/tridge/samba/contributed/fixcrlf.zip +ftp://samba.anu.edu.au/pub/samba/contributed/fixcrlf.zip ---------------------- HINT: Use the "username map" option diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/MIRRORS samba-1.9.16alpha2/docs/MIRRORS --- samba-1.9.16alpha1/docs/MIRRORS Tue Feb 20 20:41:22 1996 +++ samba-1.9.16alpha2/docs/MIRRORS Tue May 28 23:39:00 1996 @@ -1,17 +1,18 @@ -The main Samba site is nimbus.anu.edu.au in pub/tridge/samba/. Contact -samba-bugs@anu.edu.au for help with this site. +The main Samba site is samba.anu.edu.au in pub/samba/. Contact +samba-bugs@samba.anu.edu.au for help with this site. Mirror sites include: - -ftp://src.doc.ic.ac.uk/packages/samba -ftp://ftp.warwick.ac.uk/pub/linux/sunsite.unc-mirror/system/Network/samba +ftp://nimbus.anu.edu.au/pub/tridge/samba +ftp://sunsite.auc.dk/pub/unix/networking/samba/ +ftp://src.doc.ic.ac.uk/packages/samba/ +ftp://ftp.warwick.ac.uk/pub/linux/sunsite.unc-mirror/system/Network/samba/ ftp://sunsite.unc.edu/pub/Linux/system/Network/samba/ -ftp://ftp.choc.apana.org.au/pub/samba +ftp://ftp.choc.apana.org.au/pub/samba/ ftp://ftp.uni-trier.de/pub/unix/network/samba/ -ftp://ftp.spectrum.titan.com/pub/samba -ftp://ftp.demon.co.uk/pub/unix/unix/samba -ftp://sunsite.mff.cuni.cz/Net/Protocols/Samba +ftp://ftp.spectrum.titan.com/pub/samba/ +ftp://ftp.demon.co.uk/pub/unix/unix/samba/ +ftp://sunsite.mff.cuni.cz/Net/Protocols/Samba/ There are several others. Give archie a try. @@ -21,8 +22,10 @@ AIX and DEC OSF/1 binaries are available from: ftp://151.99.220.5/pub/samba (built by davide.migliavacca@inferentia.inet.it) +QNX binaries and source code: +ftp://quics.qnx.com/usr/free/staging/samba Http sites include: -http://lake.canberra.edu.au/pub/samba +http://samba.canberra.edu.au/pub/samba http://www.choc.apana.org.au/pub/samba diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/README.OS2 samba-1.9.16alpha2/docs/README.OS2 --- samba-1.9.16alpha1/docs/README.OS2 Tue Feb 20 11:43:47 1996 +++ samba-1.9.16alpha2/docs/README.OS2 Sat May 18 15:02:23 1996 @@ -41,7 +41,7 @@ Source is available from the Samba WWW site : -http://lake.canberra.edu.au/pub/samba/ +http://samba.canberra.edu.au/pub/samba/ EMX 0.9b is available from hobbes.nmsu.edu, ftp.cdrom.com, ftp.leo.org and other OS/2 FTP sites. emxrt.zip contains the required libraries. diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/Support.txt samba-1.9.16alpha2/docs/Support.txt --- samba-1.9.16alpha1/docs/Support.txt Wed Feb 28 14:42:36 1996 +++ samba-1.9.16alpha2/docs/Support.txt Sun May 5 17:15:53 1996 @@ -41,11 +41,13 @@ ------------------------------------------------------------------------------ READING - ENGLAND -Philip Hands | E-Mail: info@hands.com -Philip Hands Computing Ltd. | Tel: +44 1734 476287 Fax: 1734 474655 -Unit 1, Cherry Close, Caversham, Reading RG4 8UP UK - -Samba experience: SVR4,SVR3.2 & Linux <--> WfWg, W3.1, OS2 and MS-LanMan +Philip Hands | E-Mail: info@hands.com Tel:+44 1734 545656 +Philip Hands Computing Ltd. | Mobile: +44 802 242989 Fax:+44 1734 474655 +Unit 1, Cherry Close, Caversham, Reading RG4 8UP ENGLAND + +Samba experience: + Server platforms: Linux,SVR4,SVR3.2 & Sequent ptx + Clients: WfWg, W3.1, OS2 and MS-LanMan ------------------------------------------------------------------------------ ------------------------------------------------------------------------------ @@ -243,15 +245,15 @@ TELEPHONE 01509-620922 FAX 01509-620933 -CONTACT DAVID ROBINSON +Contact David Robinson -WE ARE UNIX ORIENTATED BUT ALSO SPECIALISE IN PC TO UNIX COMMUNICATIONS, WE -KNOW AND UNDERSTAND PC-NFS, (HENCE OUR INTEREST IN SAMBA). -WE SUPPORT SUNOS, SOLARIS 1.X AND 2.X, HP-UX 9.0 AND 10.0, OSF (or DEC UNIX, -whichever you prefer), WinNT, WfWG and Win95. +We are unix orientated but also specialise in pc to unix communications, we +know and understand pc-nfs, (hence our interest in samba). +we support sunos, solaris 1.x and 2.x, hp-ux 9.0 and 10.0, osf (or dec unix, +whichever you prefer), winnt, wfwg and win95. -WE ARE ALREADY TALKING TO A COUPLE OF VERY LARGE SAMBA USERS HERE IN THE UK. -WE WOULD LIKE TO SUPPORT THEM (AND MANY MORE), WOULD YOU PLEASE CONTACT ME ON: +We are already talking to a couple of very large samba users here in the uk. +we would like to support them (and many more), would you please contact me on: david@tectonic.demon.co.uk ---------------------------------------------------------- @@ -356,5 +358,38 @@ rowl@earthlink.net Michael St. Laurent Hartwell Corporation ------------------------------------------------------------------------ +------------------------------------------------------------------------------ + +------------------------------------------------------------------------------ +WASHINGTON DC METRO - USA + +Asset Software, Inc. has been running Samba since the 1.6 release on various +platforms, including SunOS 4.x, Solaris 2.x, IRIX 4.x and 5.x, Linux 1.1x, +1.2x, and 1.3x, and BSD UNIX 4.3 and above. We specialize in small office +network solutions and provide services to enhance a small office's +operations. Primarily a custom software operation, our vast knowledge of +Windows, DOS, Unix, Windows NT, MacOS, and OS/2 enable us to provide quality +technical assistance to the small office environment at a reasonable price. +Our upcoming multi-mailbox mail client, IQ Mail, enables users with more +than one mailbox to send and retrieve their mail from a single, consistent +mail client running in Windows. + +David J. Fenwick Asset Software, Inc. +President djf@assetsw.com +------------------------------------------------------------------------------ + + +------------------------------------------------------------------------------ +WELLINGTON - NEW ZEALAND + +David Gempton +Computer Consultant +UNIX & PC Networking specialist +TTC Technology Training Consulting +PO Box 5444 +Lambton Quay Wellington +New Zealand +Phone (025) 518-574 +Email: ttcdg@cyberspace.co.nz +------------------------------------------------------------------------------ diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/announce samba-1.9.16alpha2/docs/announce --- samba-1.9.16alpha1/docs/announce Mon Nov 27 10:55:33 1995 +++ samba-1.9.16alpha2/docs/announce Tue May 28 23:37:23 1996 @@ -93,8 +93,8 @@ Where can I get it? ------------------- -The package is available via anonymous ftp from nimbus.anu.edu.au in -the directory pub/tridge/samba/. +The package is available via anonymous ftp from samba.anu.edu.au in +the directory pub/samba/. What about SMBServer? --------------------- @@ -123,7 +123,7 @@ newsgroup comp.protocols.smb. A WWW site with lots of Samba info can be found at -http://lake.canberra.edu.au/pub/samba/ +http://samba.canberra.edu.au/pub/samba/ Andrew Tridgell (Contact: samba-bugs@anu.edu.au) January 1995 diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/history samba-1.9.16alpha2/docs/history --- samba-1.9.16alpha1/docs/history Mon Nov 27 10:55:33 1995 +++ samba-1.9.16alpha2/docs/history Sat May 4 17:50:22 1996 @@ -156,4 +156,10 @@ --------------------- - +--------------------- +It's now March 1996 and version 1.9.16alpha1 has just been +released. There have been lots of changes recently with master browser +support and the ability to do domain logons etc. Samba has also been +ported to OS/2, the amiga and NetWare. There are now 3000 people on +the samba mailing list. +--------------------- diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/nmbd.8 samba-1.9.16alpha2/docs/nmbd.8 --- samba-1.9.16alpha1/docs/nmbd.8 Sun Feb 18 18:01:18 1996 +++ samba-1.9.16alpha2/docs/nmbd.8 Mon May 6 10:35:42 1996 @@ -56,10 +56,6 @@ with the .B -n option (see "OPTIONS" below). Using the -.B -S -option (see "OPTIONS" below), it can also be instructed to respond with IP -information about other hosts, provided they are locatable via the -gethostbyname() call, or they are in a netbios hosts file. Nmbd can also be used as a WINS (Windows Internet Name Server) server. It will do this automatically by default. What this basically diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/samba.7 samba-1.9.16alpha2/docs/samba.7 --- samba-1.9.16alpha1/docs/samba.7 Mon Nov 27 10:55:33 1995 +++ samba-1.9.16alpha2/docs/samba.7 Tue May 28 23:37:23 1996 @@ -45,7 +45,7 @@ intact. The latest version of the Samba suite can be obtained via anonymous -ftp from nimbus.anu.edu.au in the directory pub/tridge/samba/. It is +ftp from samba.anu.edu.au in the directory pub/samba/. It is also available on several mirror sites worldwide. You may also find useful information about Samba on the newsgroup @@ -54,7 +54,7 @@ If you have access to a WWW viewer (such as Netscape or Mosaic) then you will also find lots of useful information, including back issues -of the Samba mailing list, at http://lake.canberra.edu.au/pub/samba/ +of the Samba mailing list, at http://samba.canberra.edu.au/pub/samba/ .SH AUTHOR diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/samba.faq samba-1.9.16alpha2/docs/samba.faq --- samba-1.9.16alpha1/docs/samba.faq Mon Nov 27 10:55:33 1995 +++ samba-1.9.16alpha2/docs/samba.faq Tue May 28 23:37:23 1996 @@ -5,7 +5,7 @@ SAMBA Suite - (FAQ version 1.9.02, Samba version 1.09.02) + (FAQ version 1.9.15a, Samba version 1.09.15) ------------------------------------------------------------------------------- @@ -54,18 +54,26 @@ * 1: What is Samba? Samba is a suite of programs which work together to allow clients to access -Unix filespace and printers via the SMB (Session Message Block) protocol. +to a server's filespace and printers via the SMB (Session Message Block) +protocol. Initially written for Unix, Samba now also runs on Netware, OS/2 and +AmigaDOS. In practice, this means that you can redirect disks and printers to Unix disks and printers from Lan Manager clients, Windows for Workgroups 3.11 clients, -Windows NT clients and OS/2 clients. There is also a Unix client program -supplied as part of the suite which allows Unix users to use an ftp-like -interface to access filespace and printers on any other SMB servers. +Windows NT clients, Linux clients and OS/2 clients. There is also a generic +Unix client program supplied as part of the suite which allows Unix users to +use an ftp-like interface to access filespace and printers on any other SMB +servers. This gives the capability for these operating systems to behave much +like a LAN Server or Windows NT Server machine, only with added functionality +and flexibility designed to make life easier for administrators. The components of the suite are (in summary): - * smbd, the SMB server. This handles actual connections from clients - * nmbd, the Netbios name server, which helps clients locate servers + * smbd, the SMB server. This handles actual connections from clients, + doing all the file, permission and username work + * nmbd, the Netbios name server, which helps clients locate servers, + doing the browsing work and managing domains as this capability is + being built into Samba * smbclient, the Unix-hosted client program * smbrun, a little 'glue' program to help the server run external programs @@ -75,32 +83,34 @@ * smb.conf, the Samba configuration file * smbprint, a sample script to allow a Unix host to use smbclient to print to an SMB server + * documentation! DON'T neglect to read it - you will save a great deal + of time! The suite is supplied with full source (of course!) and is GPLed. The primary creator of the Samba suite is Andrew Tridgell. Later versions incorporate much effort by many net.helpers. The man pages and this FAQ were -written by Karl Auer. +originally written by Karl Auer. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * 2: What is the current version of Samba? -At time of writing, the current version was 1.9.12. If you want to be sure +At time of writing, the current version was 1.9.15. If you want to be sure check the bottom of the change-log file. -(nimbus.anu.edu.au/pub/tridge/samba/change-log) +(ftp://samba.anu.edu.au/pub/samba/alpha/change-log) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * 3: Where can I get it? -The Samba suite is available via anonymous ftp from nimbus.anu.edu.au. The +The Samba suite is available via anonymous ftp from samba.anu.edu.au. The latest and greatest versions of the suite are in the directory: -/pub/tridge/samba/ +/pub/samba/ Development (read "alpha") versions, which are NOT necessarily stable and which do NOT necessarily have accurate documentation, are available in the directory: -/pub/tridge/samba/alpha +/pub/samba/alpha Note that binaries are NOT included in any of the above. Samba is distributed ONLY in source form, though binaries may be available from other sites. Recent @@ -154,7 +164,10 @@ There are two mailing lists devoted to discussion of Samba-related matters. There is also the newsgroup, comp.protocols.smb, which has a great deal of -discussion on Samba. +discussion on Samba. There is also a WWW site 'SAMBA Web Pages' at +http://samba.canberra.edu.au/pub/samba/samba.html, under which there is a +comprehensive survey of Samba users. Another useful resource is the hypertext +archive of the Samba mailing list. Send email to listproc@anu.edu.au. Make sure the subject line is blank, and include the following two lines in the body of the message: @@ -177,6 +190,9 @@ unsubscribe samba unsubscribe samba-announce +The From: line in your message MUST be the same address you used when you +subscribed. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * 6: Something's gone wrong - what should I do? @@ -184,7 +200,9 @@ DO NOT post messages on mailing lists or in newsgroups until you have carried out the first three steps given here! -Firstly, see if there are any likely looking entries in this FAQ! +Firstly, see if there are any likely looking entries in this FAQ! If you have +just installed Samba, have you run through the checklist in DIAGNOSIS.txt? It +can save you a lot of time and effort. Secondly, read the man pages for smbd, nmbd and smb.conf, looking for topics that relate to what you are trying to do. @@ -195,10 +213,20 @@ debugging information - usually level 2 or level 3 provide ample debugging info. Inspect these logs closely, looking particularly for the string "Error:". -If you successfully solve a problem, please mail me a succinct description of -the symptom, the problem and the solution, so I can incorporate it in the next -version of the FAQ. - +Fourthly, if you still haven't got anywhere, ask the mailing list or newsgroup. +In general nobody minds answering questions provided you have followed the +preceding steps. It might be a good idea to scan the archives of the mailing +list, which are available through the Samba web site described in the previous +section. + +If you successfully solve a problem, please mail the FAQ maintainer a succinct +description of the symptom, the problem and the solution, so I can incorporate +it in the next version. + +If you make changes to the source code, _please_ submit these patches so that +everyone else gets the benefit of your work. This is one of the most important +aspects to the maintainence of Samba. Send all patches to +samba-bugs@samba.anu.edu.au, not Andrew Tridgell or any other individual. =============================================================================== SECTION TWO: Compiling and installing Samba on a Unix host @@ -211,7 +239,7 @@ * 1: I can't see the Samba server in any browse lists! *** Until the FAQ can be updated, please check the file: -*** ftp://nimbus.anu.adu.au/pub/tridge/samba/BROWSING.txt +*** ftp://samba.anu.edu.au/pub/samba/BROWSING.txt *** for more information on browsing. If your GUI client does not permit you to select non-browsable servers, you may @@ -225,7 +253,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * 2: Some files that I KNOW are on the server doesn't show up when I view the -directories from my client! + directories from my client! If you check what files are not showing up, you will note that they are files which contain upper case letters or which are otherwise not DOS-compatible (ie, @@ -303,7 +331,9 @@ stuff for several reasons, including the fact that the whole concept of a primary domain controller and "logging in to a network" doesn't fit well with clients possibly running on multiuser machines (such as users of smbclient -under Unix). +under Unix). Having said that, several developers are working hard on +building it in to the next major version of Samba. If you can contribute, +send a message to samba-bugs! Seeing this message should not affect your ability to mount redirected disks and printers, which is really what all this is about. @@ -351,6 +381,26 @@ Microsoft products, particularly Excel 5 and Word for Windows 6. These should have all been solved. If not then please let Andrew Tridgell know. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* 9: My "server string" doesn't seem to be recognized, my client reports the + default setting, eg. "Samba 1.9.15p4", instead of what I have changed it + to in the smb.conf file. + +You need to use the -C option in nmbd. The "server string" affects +what smbd puts out and -C affects what nmbd puts out. In a future +version these will probably be combined and -C will be removed, but +for now use -C + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* 10: When I attempt to get a listing of available resources from the Samba + server, my client reports + "This server is not configured to list shared resources". + +Your guest account is probably invalid for some reason. Samba uses +the guest account for browsing in smbd. Check that your guest account is +valid. + +See also 'guest account' in smb.conf man page. =============================================================================== SECTION FOUR: Specific client problems @@ -381,11 +431,71 @@ Rob +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* 2: I am getting a "Session request failed (131,130)" error when I try to + connect to my Win95 PC with smbclient. I am able to connect from the PC + to the Samba server without problems. What gives? + +The following answer is provided by John E. Miller: + +I'll assume that you're able to ping back and forth between the machines by +IP address and name, and that you're using some security model where you're +confident that you've got user IDs and passwords right. The logging options +(-d3 or greater) can help a lot with that. DNS and WINS configuration can +also impact connectivity as well. + +Now, on to 'scope id's. Somewhere in your Win95 TCP/IP network configuration +(I'm too much of an NT bigot to know where it's located in the Win95 setup, +but I'll have to learn someday since I teach for a Microsoft Solution Provider +Authorized Tech Education Center - what an acronym...) [Note: It's under +Control Panel | Network | TCP/IP | WINS Configuration] there's a little text +entry field called something like 'Scope ID'. + +This field essentially creates 'invisible' sub-workgroups on the same wire. +Boxes can only see other boxes whose Scope IDs are set to the exact same +value - it's sometimes used by OEMs to configure their boxes to browse only +other boxes from the same vendor and, in most environments, this field should +be left blank. If you, in fact, have something in this box that EXACT value +(case-sensitive!) needs to be provided to smbclient and nmbd as the -i +(lowercase) parameter. So, if your Scope ID is configured as the string +'SomeStr' in Win95 then you'd have to use smbclient -iSomeStr <otherparms> +in connecting to it. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* 3: How do I synchronize my PC's clock with my Samba server? + +To syncronize your PC's clock with your Samba server: + +* Copy timesync.pif to your windows directory + * timesync.pif can be found at: + http://samba.canberra.edu.au/pub/samba/binaries/miscellaneous/timesync.pif +* Add timesync.pif to your 'Start Up' group/folder +* Open the properties dialog box for the program/icon + * Make sure the 'Run Minimized' option is set in program 'Properties' + * Change the command line section that reads \\sambahost to reflect the name + of your server. +* Close the properties dialog box by choosing 'OK' + +Each time you start your computer (or login for Win95) your PC will +synchronize it's clock with your Samba server. =============================================================================== SECTION FIVE: Specific client application problems ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* 1: MS Office Setup reports "Cannot change properties of the file named: + X:\MSOFFICE\SETUP.INI" +When installing MS Office on a Samba drive for which you have admin user +permissions, ie. admin users = <username>, you will find the setup program +unable to complete the installation. + +To get around this problem, do the installation without admin user permissions +The problem is that MS Office Setup checks that a file is rdonly by trying to +open it for writing. + +Admin users can always open a file for writing, as they run as root. +You just have to install as a non-admin user and then use "chown -R" to fix +the owner. =============================================================================== SECTION SIX: Miscellaneous @@ -394,5 +504,3 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Maintained By Paul Blackman, Email:ictinus@lake.canberra.edu.au - - diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/samba.lsm samba-1.9.16alpha2/docs/samba.lsm --- samba-1.9.16alpha1/docs/samba.lsm Mon Nov 27 10:55:33 1995 +++ samba-1.9.16alpha2/docs/samba.lsm Tue May 28 23:37:23 1996 @@ -10,8 +10,8 @@ AuthorEmail = samba-bugs@anu.edu.au Maintainer = Andrew Tridgell MaintEmail = samba-bugs@anu.edu.au -Site1 = nimbus.anu.edu.au -Path1 = pub/tridge/samba/ +Site1 = samba.anu.edu.au +Path1 = pub/samba/ File1 = samba-latest.tar.gz FileSize1 = 200K Required1 = Ansi-C compiler and a TCP/IP network. diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/docs/smbclient.1 samba-1.9.16alpha2/docs/smbclient.1 --- samba-1.9.16alpha1/docs/smbclient.1 Tue Feb 20 12:11:15 1996 +++ samba-1.9.16alpha2/docs/smbclient.1 Mon May 6 10:35:43 1996 @@ -36,6 +36,9 @@ .B -n .I netbios name ] [ +.B -W +.I workgroup +] [ .B -O .I socket options ] [ @@ -321,6 +324,14 @@ By default, the client will use the local machine's hostname (in uppercase) as its netbios name. This parameter allows you to override the host name and use whatever netbios name you wish. +.RE + +.B -W +.I workgroup + +.RS 3 +Override what workgroup is used for the connection. This may be needed +to connect to some servers. .RE .B -p diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/examples/misc/extra_smbstatus samba-1.9.16alpha2/examples/misc/extra_smbstatus --- samba-1.9.16alpha1/examples/misc/extra_smbstatus Thu Feb 22 12:04:40 1996 +++ samba-1.9.16alpha2/examples/misc/extra_smbstatus Sat May 18 15:02:23 1996 @@ -10,28 +10,31 @@ if ($1 == "-p") then smbstatus -p |sort -u else if ($1 == "-c") then - echo There are `smbstatus -p |sort -u |grep -n -v z |grep -c :` unique -smbd processes running. + echo There are `smbstatus -p |sort -u |grep -n -v z |grep -c :` unique smbd processes running. else if ($1 == "-l") then - echo `date '+ %d/%m/%y %H:%M:%S'` `smbstatus -p |sort -u |grep -n -v z -|grep -c :` >>$2 + echo `date '+ %d/%m/%y %H:%M:%S'` `smbstatus -p |sort -u |grep -n -v z |grep -c :` >>$2 +else if ($1 == "-cs") then + echo There are `smbstatus |awk '$1==share {n++;} END {print n}' share=$2` concurrent connections to share: $2 +else if ($1 == "-csl") then + echo `date '+ %d/%m/%y %H:%M:%S'` `smbstatus |awk '$1==share {n++;} END {print n}' share=$2` >>$3 else - smbstatus |sort +3 -4 -u + echo "'smbstat -c' ==> Count unique smbd processes." + echo "'smbstat -p' ==> List unique smbd processes." + echo "'smbstat -l logfile' ==> Append a log entry for the number of" + echo " concurrent and unique processes to logfile." + echo "'smbstat -cs sharename'" + echo " ==> Count processes connected to sharename (assumed unique)" + echo "'smbstat -csl sharename logfile'" + echo " ==> Append a log entry for the number of concurrent" + echo " processes connected to sharename (assumed unique)" endif ****** -The '-p' option was just to show unique PIDs. +Run this script from cron eg. -The more important ones are the '-c' and '-l' options '-c' just counts -the number of unique smbd's, While '-l' logs this count with date and -time to a log file specified on the command line. I'm using '-l' at -the moment with cron to give me an idea of usage/max connections etc. -I was also thinking of doing a log for individual/specified services. +0,5,10,15,20,25,30,35,40,50,55 * * * * /usr/local/samba/bin/smbstat -l /usr/local/samba/var/smbdcount.log -The default (last) option was to show unique PIDs with user names. -Unfortunately this still lists all file locks etc. This would be -better with a 'no locked files' option from smbstatus (or is there one -that I didn't see) +and you get a good idea of usage over time. Cheers, ~^ MIME OK ^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~ diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/examples/misc/wall.perl samba-1.9.16alpha2/examples/misc/wall.perl --- samba-1.9.16alpha1/examples/misc/wall.perl Sat Feb 24 18:54:24 1996 +++ samba-1.9.16alpha2/examples/misc/wall.perl Sun May 5 17:18:36 1996 @@ -6,40 +6,64 @@ #@(#) ...using "smbclient -M" message to winpopup service. #@(#) Default usage is to message every connected PC. #@(#) Alternate usage is to message every pc on the argument list. -#@(#) Hacked up by Keith Farrar <farrar@parc.xerox.com> +#@(#) Hacked up by Keith Farrar <farrar@parc.xerox.com> # +# Cleanup and corrections by +# Michal Jaegermann <michal@ellpspace.math.ualberta.ca> +# Message to send can be now also fed (quietly) from stdin; a pipe will do. #============================================================================= -$smbstatus = "/usr/local/bin/smbstatus"; -$smbclient = "/usr/local/bin/smbclient"; -print STDOUT "\nEnter message for Samba clients of this host\n"; -print STDOUT "(terminated with single '.' or end of file):\n"; +$smbstatus = "/usr/local/bin/smbstatus"; +$smbshout = "/usr/local/bin/smbclient -M"; -while ( <STDIN> ) { - /^\.$/ && last; - push(@message, $_); +if (@ARGV) { + @clients = @ARGV; + undef @ARGV; } +else { # no clients specified explicitly + open(PCLIST, "$smbstatus |") || die "$smbstatus failed!.\n$!\n"; + while(<PCLIST>) { + last if /^Locked files:/; + split(' ', $_, 6); + # do not accept this line if less then six fields + next unless $_[5]; + # if you have A LOT of clients you may speed things up by + # checking pid - no need to look further if this pid was already + # seen; left as an exercise :-) + $client = $_[4]; + next unless $client =~ /^\w+\./; # expect 'dot' in a client name + next if grep($_ eq $client, @clients); # we want this name once + push(@clients, $client); + } + close(PCLIST); +} + +if (-t) { + print <<'EOT'; -if ( $ARGV[0] ne "" ) { - $debug && print STDOUT "Was given args: \n\t @ARGV\n"; - foreach $client ( @ARGV ) { - $pcclient{$client} = $client; - } -} else { - open( PCLIST, "$smbstatus | /bin/awk '/^[a-z]/ {print $5}' | /bin/sort | /bin/uniq|"); - while ( <PCLIST> ) { - /^[a-z]+[a-z0-9A-Z-_]+.+/ || next; - ($share, $user, $group, $pid, $client, @junk) = split; - $pcclient{$client} = $client; - } - close(PCLIST); +Enter message for Samba clients of this host +(terminated with single '.' or end of file): +EOT + + while (<>) { + last if /^\.$/; + push(@message, $_); + } +} +else { # keep quiet and read message from stdin + @message = <>; } -foreach $pc ( keys(%pcclient) ) { - print STDOUT "Sending message "; - $debug && print STDOUT " <@message> \n"; - print STDOUT "To <$pc>\n"; - open(SENDMSG,"|$smbclient -M $pc") || next; +foreach(@clients) { +## print "To $_:\n"; + if (open(SENDMSG,"|$smbshout $_")) { print SENDMSG @message; close(SENDMSG); + } + else { + warn "Cannot notify $_ with $smbshout:\n$!\n"; + } } + +exit 0; + diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/.cvsignore samba-1.9.16alpha2/source/.cvsignore --- samba-1.9.16alpha1/source/.cvsignore Thu Jan 1 10:00:00 1970 +++ samba-1.9.16alpha2/source/.cvsignore Sun May 5 21:08:57 1996 @@ -0,0 +1,10 @@ +Makefile.ajt +nmbd +nmblookup +smbclient +smbd +smbpasswd +smbrun +smbstatus +testparm +testprns diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/Makefile samba-1.9.16alpha2/source/Makefile --- samba-1.9.16alpha1/source/Makefile Thu Feb 29 00:11:48 1996 +++ samba-1.9.16alpha2/source/Makefile Mon May 6 10:35:45 1996 @@ -264,6 +264,7 @@ # This is for HP-UX. Note that some systems don't like the -Aa switch. # contributed by Pasi.Kaara@atk.tpo.fi +# You will need -DREPLACE_GETPASS if you use smb encryption # FLAGSM = -DHPUX -Aa -D_HPUX_SOURCE -D_POSIX_SOURCE # LIBSM = @@ -452,6 +453,13 @@ # FLAGSM = -DNEWS42 -DKANJI=\"sjis\" # LIBSM = + +# This is for SONY NEWS, NEWS-OS 6.1.x +# contributed by kobo@sm.sony.co.jp (Yoichi Kobori) +# FLAGSM = -Xa -DSVR4 -DNEWS61 -DSHADOW_PWD -DNETGROUP -DGETTIMEOFDAY1 -DKANJI=\"euc\"\ -D_SONYILS_H +# LIBSM = -lsocket -lnsl + + # This is for OS/2 using EMX 0.9b # Contributed by jasonr@pec.co.nz (Jason Rumney) # FLAGSM = -DOS2 @@ -495,7 +503,7 @@ UTILOBJ = $(UTILOBJ1) md4.o loadparm.o params.o pcap.o username.o PARAMOBJ = $(UTILOBJ) ufc.o smbpass.o access.o SMBDOBJ1 = $(PARAMOBJ) trans2.o message.o dir.o printing.o locking.o -SMBDOBJ2 = ipc.o reply.o mangle.o chgpasswd.o password.o +SMBDOBJ2 = ipc.o reply.o mangle.o chgpasswd.o password.o quotas.o SMBDOBJ = $(SMBDOBJ1) $(SMBDOBJ2) $(VTP_OBJ) .SUFFIXES: diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/Makefile.OS2 samba-1.9.16alpha2/source/Makefile.OS2 --- samba-1.9.16alpha1/source/Makefile.OS2 Thu Jan 1 10:00:00 1970 +++ samba-1.9.16alpha2/source/Makefile.OS2 Sat May 4 17:50:25 1996 @@ -0,0 +1,535 @@ +########################################################################### +# Makefile for Samba SMB client/server for unix +# Copyright Andrew Tridgell 1992,1993,1994 +########################################################################### + +# The base manpages directory to put the man pages in +# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist. +MANDIR = /usr/local/man + +# The directories to put things in. If you use multiple +# architectures or share the samba binaries across NFS then +# you will probably want to change this layout. +BASEDIR = . +BINDIR = $(BASEDIR) +LIBDIR = $(BASEDIR) +VARDIR = $(BASEDIR) + +# WARNING: If you are upgrading, make sure you put all the files +# in the right spot! The default positions have changed! + + +# The permissions to give the executables +INSTALLPERMS = 0755 + +# Add any optimisation or debugging flags here +# add -DSYSLOG for syslog support +FLAGS1 = -O +LIBS1 = + +# You will need to use a ANSI C compiler. This means under SunOS 4 you can't +# use cc, instead you will have to use gcc. +CC = gcc + +# This may help with some versions of make +# SHELL = /bin/sh + +# The following can be useful for compiling on multiple architectures +srcdir=. +VPATH=$(srcdir) + +# set these to where to find various files +# These can be overridden by command line switches (see smbd(8)) +# or in smb.conf (see smb.conf(5)) +SMBLOGFILE = $(VARDIR)/log.smb +NMBLOGFILE = $(VARDIR)/log.nmb +CONFIGFILE = $(LIBDIR)/smb.cfg +LMHOSTSFILE = $(LIBDIR)/lmhosts + +# the directory where lock files go +LOCKDIR = /tmp/samba + +# set this to the default group you want your machine to appear in +# for browsing. This can also be set in nmbd (see nmbd(8)) +# NOTE: If you set it to * then nmbd will try to find a workgroup on +# the local net +WORKGROUP = WORKGROUP + +# set this to the name of the default account, which is the one +# to use when no username or password is specified. This can be overridden +# in the runtime configuration file (see smb.conf(5)) +# NOTE: The account "nobody" may not be a good one as +# on many unixes it may not be able to print. Thus you +# might have to create a separate guest account that can print. +GUESTACCOUNT = nobody + +# where you are going to have the smbrun binary. This defaults to the +# install directory. This binary is needed for correct printing +# and magic script execution. This should be an absolute path! +# Also not that this should include the name "smbrun" on the end (the +# name of the executable) +SMBRUN = $(BINDIR)/smbrun.exe + +# This is for AFS authentication. If you use AFS then set AFS_BASE +# according to your system layout, and uncomment the other lines as well. +# AFS_BASE = /usr/afsws +# AFS_FLAGS = -DAFS_AUTH -I$(AFS_BASE)/include +# AFS_LIBDIR = $(AFS_BASE)/lib +# NOTE: You may need to add -laudit in the line below +# AFS_LIBS = -L$(AFS_LIBDIR) -L$(AFS_LIBDIR)/afs -lkauth -lprot -lubik \ +# -lauth -lrxkad -lsys -ldes -lrx -llwp -lcom_err \ +# $(AFS_LIBDIR)/afs/util.a + +# This is for DCE/DFS enablement. Uncomment this so that smbd can +# operate as an authenticated user identity to operate on files that +# live in the DCE Distributed Filesystem. +# DCE_BASE = /opt/dcelocal +# DCE_FLAGS = -I$(DCE_BASE)/include +# DCE_LIBDIR = -L$(DCE_BASE)/lib +# DCE_LIBS = + +# This is for SMB encrypted (lanman) passwords. +# you may wish to add -DREPLACE_GETPASS if your getpass() is limited +# to 8 chars +# DES_BASE=/usr/local/libdes +# DES_FLAGS= -I$(DES_BASE) +# DES_LIB= -L$(DES_BASE) -ldes +# PASSWD_FLAGS=-DSMB_PASSWD=\"$(BINDIR)/smbpasswd\" -DSMB_PASSWD_FILE=\"$(BASEDIR)/private/smbpasswd\" + +###################################### +# VTP-Support +# +# uncomment the following two lines to enable VTP-Support +#VTP_FLAGS = -DWITH_VTP +#VTP_OBJ = vt_mode.o +###################################### + + +##################################### +# WHICH OPERATING SYSTEM? +# UNCOMMENT ONE OF THE SECTIONS BELOW +# MAKE SURE ONLY *ONE* IS UNCOMMENTED +# +# The following are additional flags that may apply +# -DNETGROUP if your machine supports yp netgroups +# -DSHADOW_PWD if you are using shadow passwords +# -DGETPWANAM if you wish to use getpwanam() call +# -DPWDAUTH if you have and want to use the pwdauth() call +# -DUFC_CRYPT if you want the fast crypt routine +# -DALLOW_CHANGE_PASSWORD if you want users to be able to set their password +# remotely (only works on some systems) +# -DQUOTAS for quota support in disk_free(). This probably only works +# on some systems. +# +# NOTE: GETPWANAM & PWDAUTH are mutually exclusive, if you +# Define one, you should NOT define the other. +##################################### + +##################################### +# for the JAPANESE EXTENSION +# select filename's code set for KANJI/KANA in UNIX, +# apply the following flag +# -DKANJI=\"<code>\" +# <code> is select character code set for JAPAN. +# sjis: if your machine support SJIS +# euc: if your machine support EUC +# jis7: if your machine support JIS7 +# jis8: if your machine support JIS8 +# junet: if your machine support jis7 + junet rule +# hex: if your machine only support 7 bits ascii filename only +# convert to hexdecimal code preseeding ':'. +# see also README.jis +###################################### + + +# This is for SUNOS 4. Use the SUNOS5 entry for Solaris 2. +# Note that you cannot use Suns "cc" compiler +# as it's not an Ansi-C compiler. Get gcc or acc. +# Note that if you have adjunct passwords you may need the GETPWANAM +# or PWDAUTH option. There have been reports that using PWDAUTH may crash +# your pwdauthd server so GETPWANAM is preferable (and probably faster) +# contributed by Andrew.Tridgell@anu.edu.au +# FLAGSM = -DSUNOS4 +# LIBSM = + + +# Use this for Linux with shadow passwords +# contributed by Andrew.Tridgell@anu.edu.au +# add -DLINUX_BIGCRYPT is you have shadow passwords but don't have the +# right libraries and includes +# FLAGSM = -DLINUX -DSHADOW_PWD +# LIBSM = -lshadow + +# Use this for Linux without shadow passwords +# contributed by Andrew.Tridgell@anu.edu.au +# FLAGSM = -DLINUX +# LIBSM = + + +# This is for SUNOS5 (also known as Solaris 2) +# contributed by Andrew.Tridgell@anu.edu.au +# FLAGSM = -DSUNOS5 -DSHADOW_PWD -DNETGROUP +# LIBSM = -lsocket -lnsl + + +# This is for SVR4 +# Contributed by mark@scot1.ucsalf.ac.uk +# FLAGSM = -DSVR4 -DSHADOW_PWD -DALLOW_CHANGE_PASSWORD +# LIBSM = -lsocket -lnsl -lc -L/usr/ucblib -lucb + + +# This is for the Motorola 88xxx/9xx range of machines +# Contributed by RPE@monnet.com +# FLAGSM = -DSVR4 -DSHADOW_PWD -DGETTIMEOFDAY1 +# LIBSM = -lsocket -lnsl -lc -L/usr/ucblib -lucb + + +# This is for UNIXWARE +# FLAGSM = -Xa -DSVR4 -DSHADOW_PWD +# LIBSM = -lsocket -lnsl -lc -L/usr/ucblib -lucb + + +# This is for ULTRIX. Add -DULTRIX_AUTH for Ultrix enhanced security. +# contributed by iversen@dsfys1.fi.uib.no +# FLAGSM = -DULTRIX +# LIBSM = + + +# This is for OSF1 (Alpha) +# contributed by errath@balu.kfunigraz.ac.at +# NOTE: You may need -warning_unresolved if you get unresolved symbols +# FLAGSM = -DOSF1 +# LIBSM = + +# This is for OSF1 with DCE/DFS +# contributed by Jim Doyle <doyle@oec.com> +# FLAGSM = -DOSF1 -DDFS_AUTH -DSIGCLD_IGNORE -DNO_SIGNAL_TEST +# LIBSM = -ldce -lpthreads -lmach -lc_r + +# This is for OSF1 (Alpha) with NIS and Fast Crypt +# contributed by David Gardiner <dgardine@cssip.edu.au> +# FLAGSM = -DOSF1 -DNETGROUP -DUFC_CRYPT +# LIBSM = + + +# This is for OSF1 (Alpha) V2.0 Enhanced Security +# contributed by Udo Linauer <ul@eacpc4.tuwien.ac.at> +# FLAGSM = -DOSF1 -DOSF1_ENH_SEC +# LIBSM = -lsecurity + + +# This is for AIX +# contributed by tomc@osi.curtin.edu.au +# FLAGSM = -DAIX +# LIBSM = + +# This is for AIX 3.2.5 with DCE/DFS +# contributed by Jim Doyle <doyle@oec.com> +# FLAGSM = -DAIX -DDFS_AUTH -DSIGCLD_IGNORE -DNO_SIGNAL_TEST +# LIBSM = -lc_r -ldce -lpthreads +# CC = cc_r + +# This is for BSDI +# contributed by tomh@metrics.com +# versions of BSDI prior to 2.0 may need to add -DUSE_F_FSIZE for +# disk usage stats to be correct +# FLAGSM = -DBSDI +# LIBSM = + + +# This is for NetBSD. Add -DNETBSD_1_0 if you are using 1.0 +# contributed by noses@oink.rhein.de +# FLAGSM = -DNETBSD -DSHADOW_PWD +# LIBSM = -lcrypt + + +# This is for SEQUENT. +# Contributed by fwk@ix.netcom.com (Frank Keeney) and +# rpwillia@Pentagon-EMH6.army.mil (Ray Williams) +# tested on DYNIX/ptx(R) V2.1.0 +# FLAGSM = -DSEQUENT -DSHADOW_PWD -DHAVE_TIMEZONE +# LIBSM = -lrpc -lsocket -lPW -linet -lnsl -lseq -lsec + + +# This is for HP-UX. Note that some systems don't like the -Aa switch. +# contributed by Pasi.Kaara@atk.tpo.fi +# FLAGSM = -DHPUX -Aa -D_HPUX_SOURCE -D_POSIX_SOURCE +# LIBSM = + +# This is for HP-UX with DCE/DFS +# contributed by Jim Doyle <doyle@oec.com> +# FLAGSM = -DHPUX -Aa -D_HPUX_SOURCE -D_POSIX_SOURCE -DDFS_AUTH -D_REENTRANT -I/usr/include/reentrant +# LIBSM = -ldce -lM -lc_r + + +# This is for SGI. +# contributed by lpc@solomon.technet.sg (Michael Chua) +# FOR SGI IRIX 4.x.x, use the following line +# FLAGSM = -DSGI -DHAVE_TIMEZONE +# LIBSM = -lsun + +# FOR SGI IRIX 5.x.x, use this line instead +# FLAGSM = -DSGI5 -DSHADOW_PWD -DHAVE_TIMEZONE +# LIBSM = + + +# This is for FreeBSD +# contributed by kuku@acds.physik.rwth-aachen.de +# NOTE: You may need to add -DBSD44 if you have password problems +# FLAGSM = -DFreeBSD +# LIBSM = -lcrypt + + +# This is for NEXTSTEP Release 2.X +# No Posix. +# contributed by brad@cac.washington.edu (Brad Greer) +# FLAGSM = -DNEXT2 +# LIBSM = + +# This is for NEXTSTEP Release 3.0 and greater (including OPENSTEP for Mach). +# contributed by brad@cac.washington.edu (Brad Greer) +# additional configuration by pmarcos@next.com (Paul Marcos) +# For compiling n-way fat executables, you should append the appropriat -arch +# flags to the FLAGSM variable. Valid flags are: +# -arch m68k +# -arch i386 +# -arch hppa +# -arch sparc +# To compile 4-way fat, you would append +# -arch m68k -arch i386 -arch hppa -arch sparc +# FLAGSM = -DNEXT3_0 +# LIBSM = + + +# NOTE: ISC is also known as "INTERACTIVE" +# This is for Sunsoft ISC SVR3V4 running in POSIX mode +# contributed by pim@cti-software.nl (Pim Zandbergen) +# FLAGSM = -posix -D_SYSV3 -DISC -DSHADOW_PWD +# LIBSM = -lsec -lcrypt -linet + +# This is for Sunsoft ISC SVR3V4 running in iBCS2 mode +# contributed by pim@cti-software.nl (Pim Zandbergen) +# FLAGSM = -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_SYSV3\ +# -DISC -DSHADOW_PWD -DREPLACE_GETWD -DREPLACE_RENAME +# LIBSM = -lsec -lcrypt -linet -lcposix + + +# This is for A/UX 3.0 +# Contributed by root@dolphin.csudh.edu (Jon S. Stevens) +# FLAGSM = -DAUX +# LIBSM = + +# This is for Altos Series 386/1000 +# Contributed by cal@zls.com +# FLAGSM = -DALTOS -DHAS_RDCHK +# LIBSM = -lsocket -lxenix + + +#Note: The SCO entries require the libcrypt library. You can get it via +#anonymous ftp from ftp.sco.com:/SLS/lng225b.* or ftp.uu.net:/vendors/sco +# +# Use this for SCO with shadow passwords. Tested on "Open enterprise 3.0" +# SCO changes from Heinz Mauelshagen (mauelsha@ez.da.telekom.de) +# FLAGSM = -DSCO -DSHADOW_PWD -DNETGROUP +# LIBSM = -lyp -lrpc -lyp -lsec -lsocket -lcrypt_i -lintl + +# Use this for SCO with shadow passwords, without YP. +# Tested on "Open Enterprise Server 3.0" (John Owens john@micros.com) +# Also, use "CC = cc" above. +# FLAGSM = -DSCO -DSHADOW_PWD +# LIBSM = -lsec -lsocket -lcrypt_i + +# Use this for SCO with TCB passwords (default). +# Tested on "Open enterprise 3.0". Contributed by lance@fox.com. +# CC = cc +# FLAGSM = -DSCO -DSecureWare +# LIBSM = -lprot_s -lcrypt -lsocket -lm -lc_s + +# Use this for SCO Unix 3.2v2 (ODT 1.1) with TCB passwords (default). +# Contributed by Stephen.Rothwell@pd.necisa.oz.au +# N.B. this needs gcc +# FLAGSM = -DSCO -DSecureWare -DSCO3_2_2 +# LIBSM = -lprot -lcrypt_i -lsocket -lm -lintl + +# This is for the european distribution of SCO. +# Contributed by Urmet.Janes@gwhite.goodwin.ee +# FLAGSM = -DSCO -DSHADOW_PWD +# LIBSM = -lsec -lsocket /usr/lib/libcrypt_i.a -lintl + +# Use this for SCO OpenServer 5 with TCB passwords (default). +# contributed by Scott Michel <scottm@intime.intime.com> +# CC = cc -Xc +# FLAGSM = -DSCO -DSecureWare -DEVEREST -DUSE_MMAP +# LIBSM = -lprot -lcurses -lcrypt -lsocket -lPW -lm -lx -lc_s -lc + + +# This is for intergraph. +# contributed by cjkiick@flinx.b11.ingr.com +# modified by ttj@sknsws61.sjo.statkart.no +# FLAGSM = -DCLIX -D_INGR_EXTENSIONS=1 +# LIBSM = -lbsd -lc_s + +# This is for DGUX. +# Contributed by ross@augie.insci.com (Ross Andrus) +# FLAGSM = -DDGUX +# LIBSM = + +# This is for Apollo Domain/OS sr10.3 (systype = BSD4.3) +# Added 1994-07-08 Stephen C. Steel <steve@qv3donald.LeidenUniv.nl> +# additional patches by jmi@csd.cri.dk (John Mills) +# you may need the "-A ansi" switch to cc +# FLAGSM = -DAPOLLO -D_INCLUDE_BSD_SOURCE -D_INCLUDE_XOPEN_SOURCE +# LIBSM = + + +# RiscIX. +# contributed by Jim Barry <jim@ilp.com> and +# Charles Gay-Jones <charlie@ilp.com> +# FLAGSM = -DRiscIX -DNOSTRDUP +# LIBSM = + + +# This is for System V with some berkely extensions (Motorola 88k R32V3.2). +# contributed by tonyb@plaza.ds.adp.com (Tony D. Birnseth) +# FLAGSM = -DM88K_R3 +# LIBSM = -lgen -lbsd -lnsl + + +# This is for DNIX. +# contributed by Peter Olsson <pol@leissner.se> +# NOTE: You may need an updated libc.a from your vendor as older +# versions have broken mktime calls and no initgroups() call +# NOTE2: You may need -lpasswd if you use shadow passwords +# NOTE3: Please read the file DNIX.txt in the docs directory. It +# contains important information about uid handling under DNIX, you may +# need to patch your C library. +# FLAGSM = -DDNIX -I/usr/include/bsd +# LIBSM = -ln + + +# This is for Cray, Unicos 8.0 +# contributed by velo@sesun3.epfl.ch (Martin Ouwehand) +# FLAGSM = -DCRAY -U__STDC__ -DQUOTAS +# LIBSM = + +# This is for Convex +# contributed by Victor Balashov <balashov@cv.jinr.dubna.su> +# and Ulrich Hahn <ulrich.hahn@zdv.uni-tuebingen.de> +# FLAGSM= -DCONVEX -DSHADOW_PWD +# LIBSM= + +# This is for SMP_DC.OSx v1.1-94c079 on Pyramid S series +# contributed by jeffrey@itm.org +# FLAGSM = -DSOLARIS -DSHADOW_PWD -DBSD_COMP +# LIBSM = -lsocket -lnsl + +# This is for QNX 4.22 +# Contributed by eldo@invisa.satlink.net (Eldo Loguzzo) +# FLAGSM = -DQNX -DGUEST_SESSSETUP=1 +# LIBSM = + + +# This is for SONY NEWS, NEWS-OS 4.2.x +# contributed by sky@sm.sony.co.jp (Katushi Sato) +# FLAGSM = -DNEWS42 -DKANJI=\"sjis\" +# LIBSM = + +# This is for OS/2 using EMX 0.9b +# Contributed by jasonr@pec.co.nz (Jason Rumney) +FLAGSM = -DOS2 +LIBSM = -Zexe -Zbin-files -lsocket + + +###################################################################### +# DON'T EDIT BELOW THIS LINE +###################################################################### + +CFLAGS1 = $(FLAGS1) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\" +CFLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" +CFLAGS3 = -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" +CFLAGS4 = -DWORKGROUP=\"$(WORKGROUP)\" -DGUEST_ACCOUNT=\"$(GUESTACCOUNT)\" +CFLAGS5 = $(CFLAGS1) $(CFLAGS2) $(CFLAGS3) $(CFLAGS4) $(FLAGSM) $(AFS_FLAGS) +CFLAGS = $(CFLAGS5) $(DCE_FLAGS) $(DES_FLAGS) $(PASSWD_FLAGS) $(VTP_FLAGS) +LIBS = $(LIBS1) $(LIBSM) $(DCE_LIBS) $(DES_LIB) + +PROGS1 = smbd smbclnt nmbd testparm testprns smbrun smbstat smbpass +PROGS = $(PROGS1) nmblook +SCRIPTS = smbtar addtosmbpass + +all : $(PROGS) + +#CHECK : +# @$(SHELL) $(srcdir)/checkos.sh $(FLAGSM) +# @echo "Using CFLAGS = $(CFLAGS)" +# @echo "Using LIBS = $(LIBS)" + +INCLUDES1 = version.h local.h includes.h smb.h loadparm.h params.h smbpass.h +INCLUDES2 = pcap.h trans2.h reply.h +INCLUDES = $(INCLUDES1) $(INCLUDES2) + +UTILOBJ1 = util.o system.o charset.o kanji.o fault.o smbencrypt.o charcnv.o +UTILOBJ = $(UTILOBJ1) md4.o loadparm.o params.o pcap.o username.o +PARAMOBJ = $(UTILOBJ) ufc.o smbpass.o access.o +SMBDOBJ1 = $(PARAMOBJ) trans2.o message.o dir.o printing.o locking.o +SMBDOBJ2 = ipc.o reply.o mangle.o chgpasswd.o password.o +SMBDOBJ = $(SMBDOBJ1) $(SMBDOBJ2) $(VTP_OBJ) + +.SUFFIXES: +.SUFFIXES: .c .o .h + +.c.o: $(INCLUDES) + @echo Compiling $*.c + @$(CC) $(CFLAGS) -c $(srcdir)/$*.c + +smbd: server.o $(SMBDOBJ) + @echo Linking smbd + @$(CC) $(CFLAGS) -o smbd server.o $(SMBDOBJ) $(LIBS) $(AFS_LIBS) + +smbrun: smbrun.o + @echo Linking smbrun + @$(CC) $(CFLAGS) -o smbrun smbrun.o $(LIBS) + +nmblook: nmblookup.o nmblib.o $(UTILOBJ) + @echo Linking nmblookup + @$(CC) $(CFLAGS) -o nmblook nmblookup.o nmblib.o $(UTILOBJ) $(LIBS) + +nmbd: nameserv.o nmblib.o nmbsync.o $(PARAMOBJ) + @echo Linking nmbd + @$(CC) $(CFLAGS) -o nmbd nameserv.o nmblib.o nmbsync.o $(PARAMOBJ) $(LIBS) + +smbclnt: client.o clitar.o getsmbpass.o $(UTILOBJ) + @echo Linking smbclient + @$(CC) $(CFLAGS) -o smbclnt client.o clitar.o getsmbpass.o $(UTILOBJ) $(LIBS) + +smbstat: status.o $(PARAMOBJ) + @echo Linking smbstatus + @$(CC) $(CFLAGS) -o smbstat status.o $(PARAMOBJ) $(LIBS) + +testparm: testparm.o $(PARAMOBJ) + @echo Linking testparm + @$(CC) $(CFLAGS) -o testparm testparm.o $(PARAMOBJ) $(LIBS) + +testprns: testprns.o $(PARAMOBJ) + @echo Linking testprns + @$(CC) $(CFLAGS) -o testprns testprns.o $(PARAMOBJ) $(LIBS) + +smbpass: smbpasswd.o getsmbpass.o $(PARAMOBJ) + @echo Linking smbpasswd + @$(CC) $(CFLAGS) -o smbpass smbpasswd.o getsmbpass.o $(PARAMOBJ) $(LIBS) + +install: installbin installman + +installbin: all + @$(SHELL) $(srcdir)/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS) $(SCRIPTS) + +# revert to the previously installed version +revert: + @$(SHELL) $(srcdir)/revert.sh $(BINDIR) $(PROGS) $(SCRIPTS) + +installman: + @$(SHELL) $(srcdir)/installman.sh $(MANDIR) + +clean: + rm -f core *.o *~ $(PROGS) + +realclean: clean diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/change-log samba-1.9.16alpha2/source/change-log --- samba-1.9.16alpha1/source/change-log Thu Feb 29 00:20:01 1996 +++ samba-1.9.16alpha2/source/change-log Wed May 29 14:28:46 1996 @@ -1757,6 +1757,8 @@ - added more flexible GUEST_SESSSETUP to local.h and restored pre-p7 behaviour as default - released p8 + +1.9.16: - Makefile fix from Marty Leisner <leisner@sdsp.mc.xerox.com> - added %g and %G substitutions - changed IDLE_CLOSED_TIMEOUT to 60 @@ -1790,6 +1792,11 @@ - smbtar fixes from Martin.Kraemer@mch.sni.de - Linux quota patch from xeno@mix.hsv.no - try to work around NT passlen2 problem in session setup + - released alpha1 + +NOTE: From now on the cvs.log file will be used to give a complete log of +changes to samba. This change-log is now obsolete. + ========== todo: diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/charset.h samba-1.9.16alpha2/source/charset.h --- samba-1.9.16alpha1/source/charset.h Thu Jun 29 18:17:22 1995 +++ samba-1.9.16alpha2/source/charset.h Sun May 5 17:18:38 1996 @@ -57,5 +57,9 @@ #define islower(c) (((char)(c)) != toupper(c)) #define isdoschar(c) (dos_char_map[(char)(c)] != 0) #define isspace(c) ((c)==' ' || (c) == '\t') + +/* this is used to determine if a character is safe to use in + something that may be put on a command line */ +#define issafe(c) (isalnum(c) || strchr("-._",c)) #endif diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/client.c samba-1.9.16alpha2/source/client.c --- samba-1.9.16alpha1/source/client.c Thu Feb 29 00:11:48 1996 +++ samba-1.9.16alpha2/source/client.c Mon May 6 10:35:45 1996 @@ -2131,13 +2131,12 @@ strcpy(rname,cur_dir); strcat(rname,lname); - if (!do_mkdir(rname)) - { - strcat(lname,"/"); - if (!seek_list(f,lname)) - break; - goto again1; - } + if (!chkpath(rname,False) && !do_mkdir(rname)) { + strcat(lname,"/"); + if (!seek_list(f,lname)) + break; + goto again1; + } continue; } @@ -3182,19 +3181,36 @@ strcpy(pword, ""); passlen=1; } - set_message(outbuf,4,2 + strlen(service) + passlen + strlen(dev),True); - CVAL(outbuf,smb_com) = SMBtconX; - setup_pkt(outbuf); - - SSVAL(outbuf,smb_vwv0,0xFF); - SSVAL(outbuf,smb_vwv3,passlen); + if (Protocol <= PROTOCOL_CORE) { + set_message(outbuf,0,6 + strlen(service) + passlen + strlen(dev),True); + CVAL(outbuf,smb_com) = SMBtcon; + setup_pkt(outbuf); - p = smb_buf(outbuf); - memcpy(p,pword,passlen); - p += passlen; - strcpy(p,service); - p = skip_string(p,1); - strcpy(p,dev); + p = smb_buf(outbuf); + *p++ = 0x04; + strcpy(p, service); + p = skip_string(p,1); + *p++ = 0x04; + memcpy(p,pword,passlen); + p += passlen; + *p++ = 0x04; + strcpy(p, dev); + } + else { + set_message(outbuf,4,2 + strlen(service) + passlen + strlen(dev),True); + CVAL(outbuf,smb_com) = SMBtconX; + setup_pkt(outbuf); + + SSVAL(outbuf,smb_vwv0,0xFF); + SSVAL(outbuf,smb_vwv3,passlen); + + p = smb_buf(outbuf); + memcpy(p,pword,passlen); + p += passlen; + strcpy(p,service); + p = skip_string(p,1); + strcpy(p,dev); + } } send_smb(Client,outbuf); @@ -3225,11 +3241,18 @@ } - max_xmit = MIN(max_xmit,BUFFER_SIZE-4); - if (max_xmit <= 0) - max_xmit = BUFFER_SIZE - 4; + if (Protocol <= PROTOCOL_CORE) { + max_xmit = SVAL(inbuf,smb_vwv0); - cnum = SVAL(inbuf,smb_tid); + cnum = SVAL(inbuf,smb_vwv1); + } + else { + max_xmit = MIN(max_xmit,BUFFER_SIZE-4); + if (max_xmit <= 0) + max_xmit = BUFFER_SIZE - 4; + + cnum = SVAL(inbuf,smb_tid); + } DEBUG(3,("Connected with cnum=%d max_xmit=%d\n",cnum,max_xmit)); diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/cvs.log samba-1.9.16alpha2/source/cvs.log --- samba-1.9.16alpha1/source/cvs.log Thu Jan 1 10:00:00 1970 +++ samba-1.9.16alpha2/source/cvs.log Wed May 29 14:35:23 1996 @@ -0,0 +1,678 @@ + +**************************************** +Date: Saturday May 4, 1996 @ 20:32 +Author: samba-bugs + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv8106 + +Modified Files: + includes.h +Log Message: +added sequent fixes + + + + + + +**************************************** +Date: Saturday May 4, 1996 @ 20:43 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv8316 + +Modified Files: + ipc.c +Log Message: +use the new issafe() macro instead of isalnum() and strchr() + + + +**************************************** +Date: Saturday May 4, 1996 @ 20:44 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv8360 + +Modified Files: + mangle.c +Log Message: +move the dot_pos calculation down a bit + + + + +**************************************** +Date: Saturday May 4, 1996 @ 20:45 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv8389 + +Modified Files: + password.c +Log Message: +fix a netgroup bug (innetgr() was being called with the args in the +wrong order!) + + + + + +**************************************** +Date: Saturday May 4, 1996 @ 20:48 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv8426 + +Modified Files: + server.c +Log Message: +- use issafe() + +- map the archive bit in a more robust manner. We now set it when we +first write to the file after opening it. + + + + + + +**************************************** +Date: Saturday May 4, 1996 @ 20:49 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv8458 + +Modified Files: + util.c +Log Message: +fix a dst bug, we had a sign wrong in the calculation :-( + + + + +**************************************** +Date: Saturday May 4, 1996 @ 20:51 +Author: tridge + +Update of /data/cvs/samba/examples/misc +In directory arvidsjaur:/var/tmp/cvs-serv8546 + +Modified Files: + wall.perl +Log Message: +updates to wall.perl from michal@ellpspace.math.ualberta.ca + + + +**************************************** +Date: Saturday May 4, 1996 @ 23:13 +Author: samba-bugs + +Update of /data/cvs/samba +In directory arvidsjaur:/var/tmp/cvs-serv13363/samba + +Modified Files: + README +Log Message: +Changed to reflect new ownership by Microsoft + + + +**************************************** +Date: Saturday May 4, 1996 @ 23:16 +Author: tridge + +Update of /data/cvs/samba +In directory arvidsjaur:/var/tmp/cvs-serv13433 + +Modified Files: + README +Log Message: +removed obscene comment added by Dan + + + +**************************************** +Date: Sunday May 5, 1996 @ 13:04 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv587 + +Modified Files: + server.c +Log Message: +- close the listening socket in the child process when running as a daemon +- exit with a non-zero exit code if open_sockets() fails + + + +**************************************** +Date: Sunday May 5, 1996 @ 13:04 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv615 + +Modified Files: + version.h +Log Message: +change version number to 1.9.16p2 + + + + +**************************************** +Date: Sunday May 5, 1996 @ 17:19 +Author: samba-bugs + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/samba/samba-bugs/samba/docs + +Modified Files: + Support.txt +Log Message: +added some more support entries from samba-bugs mail + + + +**************************************** +Date: Sunday May 5, 1996 @ 18:02 +Author: tridge + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/var/tmp/cvs-serv6791 + +Modified Files: + nmbd.8 +Log Message: +removed old -S option from nmbd manpage + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 18:03 +Author: tridge + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/var/tmp/cvs-serv6832 + +Modified Files: + smbclient.1 +Log Message: +documented -W option + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:08 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10254 + +Added Files: + .cvsignore +Log Message: +ignore some files + + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:10 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10352 + +Modified Files: + Makefile +Log Message: +- added NEWOS 6 support + +- added quotas.o + + + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:12 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10423 + +Modified Files: + client.c +Log Message: +- handle CORE protocol better +- handle case where director exists when untarring + + + + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:23 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10576 + +Modified Files: + dir.c +Log Message: +handle being passed a dptr of -1 to mean "close all open dir handles". +Looks like OS/2 does this. It caused a core dump. + + + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:24 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10602 + +Modified Files: + local.h +Log Message: +turn on KEEP_PASSWORD_SERVER_OPEN by default + + + + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:24 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10629 + +Modified Files: + password.c +Log Message: +turn on KEEP_PASSWORD_SERVER_OPEN by default + + + + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:25 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10657 + +Added Files: + quotas.c +Log Message: +move quotas support out of server.c + + + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:26 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10682 + +Modified Files: + server.c +Log Message: +- fix a bug hanlding very log filenames +- move quotas support to separate file +- send keepalives to password server + + + + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:33 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10862 + +Modified Files: + status.c +Log Message: +- added hostname support to smbstatus +- fix a bug where -s would not be recognised + + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:34 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10889 + +Modified Files: + trans2.c +Log Message: +made dptr_num signed to handle -1 from OS/2 + + + + + + + + +**************************************** +Date: Sunday May 5, 1996 @ 21:35 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv10930 + +Modified Files: + version.h +Log Message: +fixed version number (again!) + + + + + + + + + +**************************************** +Date: Monday May 6, 1996 @ 10:36 +Author: samba-bugs + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/samba/samba-bugs/samba/docs + +Modified Files: + MIRRORS +Log Message: +added QNX entry to MIRRORS + + + +**************************************** +Date: Monday May 6, 1996 @ 16:46 +Author: samba-bugs + +Update of /data/cvs/samba/examples/misc +In directory arvidsjaur:/var/tmp/cvs-serv5225 + +Modified Files: + extra_smbstatus +Log Message: +Updated smbstat script with a better one, Paul. + + + +**************************************** +Date: Monday May 6, 1996 @ 18:55 +Author: samba-bugs + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/var/tmp/cvs-serv8483 + +Modified Files: + BUGS.txt MIRRORS README.OS2 announce samba.7 +Log Message: +Updated references in doco to 'http://lake.can.....' +with 'http://samba.can.....' and added a mirror site to MIRROR + + + +**************************************** +Date: Monday May 6, 1996 @ 19:16 +Author: samba-bugs + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/var/tmp/cvs-serv8786 + +Modified Files: + samba.faq +Log Message: +Update the samba.faq file with what was current on the web site, there +were a number of additions. +Changed the faq version number to 1.9.15 to match current samba version. + + + +**************************************** +Date: Friday May 17, 1996 @ 10:43 +Author: samba-bugs + +Update of /data/cvs/samba +In directory arvidsjaur:/var/tmp/cvs-serv32671 + +Modified Files: + README +Log Message: + +Made chang +blody comso: can't see what i'm writing... +Made changes to reflect nimbus.anu.edu.au -> samba.anu.edu.au chage. +changed reference to /ub/samba/change-log o /ub/samba/alpha/change-log +Also added samba.faq.html to docs directory +Paul... + + + + +**************************************** +Date: Friday May 17, 1996 @ 10:43 +Author: samba-bugs + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/var/tmp/cvs-serv32671/docs + +Modified Files: + samba.faq +Log Message: + +Made chang +blody comso: can't see what i'm writing... +Made changes to reflect nimbus.anu.edu.au -> samba.anu.edu.au chage. +changed reference to /ub/samba/change-log o /ub/samba/alpha/change-log +Also added samba.faq.html to docs directory +Paul... + + + + +**************************************** +Date: Monday May 20, 1996 @ 18:11 +Author: samba-bugs + +Update of /data/cvs/samba +In directory arvidsjaur:/var/tmp/cvs-serv27227 + +Modified Files: + README +Log Message: +Changed more references of 'nimbus.anu.edu.au/pub/tridge/samba' to +'samba.anu.edu.au/pub/samba' +The only reference I see now to 'nimbus' is in ENCRYPTION.txt regarding +libdes stuff. +Paul... + + + +**************************************** +Date: Monday May 20, 1996 @ 18:11 +Author: samba-bugs + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/var/tmp/cvs-serv27227/docs + +Modified Files: + HINTS.txt MIRRORS announce samba.7 samba.lsm +Log Message: +Changed more references of 'nimbus.anu.edu.au/pub/tridge/samba' to +'samba.anu.edu.au/pub/samba' +The only reference I see now to 'nimbus' is in ENCRYPTION.txt regarding +libdes stuff. +Paul... + + + +**************************************** +Date: Friday May 24, 1996 @ 9:23 +Author: samba-bugs + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/var/tmp/cvs-serv2665/samba/docs + +Modified Files: + DIAGNOSIS.txt +Log Message: +Added check for something already binding to port 139 to TEST 3 + Dan + + + +**************************************** +Date: Friday May 24, 1996 @ 9:45 +Author: samba-bugs + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/var/tmp/cvs-serv2938/samba/docs + +Modified Files: + samba.faq +Log Message: +Updated general section to include more about current capabilities. Added +references to samba-bugs, DIAGNOSIS.txt and the hypermail archives. Various +other small changes. + Dan + + + +**************************************** +Date: Friday May 24, 1996 @ 9:50 +Author: samba-bugs + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/var/tmp/cvs-serv3028/samba/docs + +Modified Files: + BUGS.txt +Log Message: +Added reference to DIAGNOSIS.txt. Deleted the claim that tridge reads all +postings to mailing list. Removed arvidsjaur, other small stuff. + Dan + + + +**************************************** +Date: Friday May 24, 1996 @ 9:54 +Author: samba-bugs + +Update of /data/cvs/samba +In directory arvidsjaur:/var/tmp/cvs-serv3126/samba + +Modified Files: + README +Log Message: +General updating. + Dan + + + +**************************************** +Date: Tuesday May 28, 1996 @ 23:39 +Author: samba-bugs + +Update of /data/cvs/samba/docs +In directory arvidsjaur:/samba/samba-bugs/samba/docs + +Modified Files: + MIRRORS +Log Message: +added nimbus to list of mirrors + + + +**************************************** +Date: Wednesday May 29, 1996 @ 13:11 +Author: tridge + +Update of /data/cvs/samba/source +In directory arvidsjaur:/var/tmp/cvs-serv13319 + +Modified Files: + util.c +Log Message: +cleaned up the way the max log size stuff works and fixed a potential +problem with varargs usage in Debug() + + + +**************************************** +Date: Wednesday May 29, 1996 @ 14:34 +Author: samba-bu + +Update of /data/cvs/samba/source +In directory arvidsjaur:/samba/samba-bugs/samba/source + +Modified Files: + change-log +Log Message: +preparing for release of 1.9.16alpha2 + diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/dir.c samba-1.9.16alpha2/source/dir.c --- samba-1.9.16alpha1/source/dir.c Sun Dec 3 19:26:31 1995 +++ samba-1.9.16alpha2/source/dir.c Mon May 6 10:35:45 1996 @@ -186,6 +186,19 @@ ****************************************************************************/ void dptr_close(int key) { + /* OS/2 seems to use -1 to indicate "close all directories" */ + if (key == -1) { + int i; + for (i=0;i<NUMDIRPTRS;i++) + dptr_close(i); + return; + } + + if (key < 0 || key >= NUMDIRPTRS) { + DEBUG(3,("Invalid key %d given to dptr_close\n",key)); + return; + } + if (dirptrs[key].valid) { DEBUG(4,("closing dptr key %d\n",key)); if (dirptrs[key].ptr) { diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/includes.h samba-1.9.16alpha2/source/includes.h --- samba-1.9.16alpha1/source/includes.h Thu Feb 29 00:11:48 1996 +++ samba-1.9.16alpha2/source/includes.h Sun May 5 17:18:39 1996 @@ -481,7 +481,6 @@ #include <netinet/ip.h> #define SIGNAL_CAST (void (*)()) #define USE_DIRECT -#define REPLACE_INNETGR #endif @@ -548,6 +547,32 @@ #define USE_DIRECT #endif +#ifdef SEQUENT_PTX4 +#include <string.h> +#include <sys/dir.h> +#include <dirent.h> +#include <sys/statfs.h> +#include <sys/statvfs.h> +#include <sys/vfs.h> +#include <fcntl.h> +#include <sys/sockio.h> +#include <netinet/tcp.h> +#include <stropts.h> +#include <termios.h> +#define SYSV +#define USE_WAITPID +#define SIGNAL_CAST (void (*)(int)) +#define USE_STATVFS +#define USE_GETCWD +#ifndef seteuid +#define seteuid(uid) setreuid(-1,uid) +#endif +#ifndef setegid +#define setegid(gid) setregid(-1,gid) +#endif +#endif + + #ifdef NEXT2 #include <sys/types.h> #include <strings.h> @@ -734,7 +759,6 @@ #endif /* DNIX */ #ifdef CONVEX -#define SIGNAL_CAST (void (*)(int)) #include <netinet/tcp.h> #include <arpa/inet.h> #include <dirent.h> diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/ipc.c samba-1.9.16alpha2/source/ipc.c --- samba-1.9.16alpha1/source/ipc.c Sun Feb 25 13:10:05 1996 +++ samba-1.9.16alpha2/source/ipc.c Sun May 5 17:18:39 1996 @@ -1551,8 +1551,7 @@ int l = 0; while (l<64 && *s) { - if (isalnum(*s) || strchr("-._",*s)) - name[l++] = *s; + if (issafe(*s)) name[l++] = *s; s++; } name[l] = 0; diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/local.h samba-1.9.16alpha2/source/local.h --- samba-1.9.16alpha1/source/local.h Fri Jan 19 20:00:57 1996 +++ samba-1.9.16alpha2/source/local.h Mon May 6 10:35:45 1996 @@ -163,5 +163,8 @@ /* shall we support browse requests via a FIFO to nmbd? */ #define ENABLE_FIFO 1 +/* keep the password server open, this uses up a aocket, but is needed + by many apps */ +#define KEEP_PASSWORD_SERVER_OPEN 1 #endif diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/mangle.c samba-1.9.16alpha2/source/mangle.c --- samba-1.9.16alpha1/source/mangle.c Thu Dec 7 10:23:34 1995 +++ samba-1.9.16alpha2/source/mangle.c Sun May 5 17:18:39 1996 @@ -90,8 +90,6 @@ if (slash_pos) fname = slash_pos+1; len = strlen(fname); - dot_pos = strchr(fname,'.'); - DEBUG(5,("checking %s for 8.3\n",fname)); if (case_mangle) @@ -121,6 +119,8 @@ /* %%% A nice improvment to name mangling would be to translate filename to ANSI charset on the smb server host */ + + dot_pos = strchr(fname,'.'); { char *p = fname; diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/password.c samba-1.9.16alpha2/source/password.c --- samba-1.9.16alpha1/source/password.c Tue Jan 30 17:25:45 1996 +++ samba-1.9.16alpha2/source/password.c Mon May 6 10:35:45 1996 @@ -1153,13 +1153,12 @@ BOOL host_ok = False; #ifdef NETGROUP - /* THIS IS UNTESTED!! */ if (is_group) { static char *mydomain = NULL; if (!mydomain) yp_get_default_domain(&mydomain); - if (mydomain && innetgr(remote,file_host,user,mydomain)) + if (mydomain && innetgr(file_host,remote,user,mydomain)) host_ok = True; } #else @@ -1242,7 +1241,7 @@ } -static int password_client = -1; +int password_client = -1; static fstring pserver; /**************************************************************************** @@ -1406,7 +1405,7 @@ DEBUG(3,("password server %s accepted the password\n",pserver)); -#ifndef KEEP_PASSWORD_SERVER_OPEN +#if !KEEP_PASSWORD_SERVER_OPEN close(password_client); password_client= -1; #endif diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/quotas.c samba-1.9.16alpha2/source/quotas.c --- samba-1.9.16alpha1/source/quotas.c Thu Jan 1 10:00:00 1970 +++ samba-1.9.16alpha2/source/quotas.c Sun May 5 21:25:13 1996 @@ -0,0 +1,330 @@ +/* + Unix SMB/Netbios implementation. + Version 1.9. + support for quotas + Copyright (C) Andrew Tridgell 1992-1995 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "includes.h" + + +#ifdef QUOTAS + +#ifdef LINUX +/**************************************************************************** +try to get the disk space from disk quotas (LINUX version) +****************************************************************************/ +/* +If you didn't make the symlink to the quota package, too bad :( +*/ +#include "quota/quotactl.c" +#include "quota/hasquota.c" +static BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) +{ + uid_t euser_id; + struct dqblk D; + struct stat S; + dev_t devno ; + struct mntent *mnt; + FILE *fp; + int found ; + int qcmd, fd ; + char *qfpathname; + + /* find the block device file */ + + if ( stat(path, &S) == -1 ) + return(False) ; + + devno = S.st_dev ; + + fp = setmntent(MOUNTED,"r"); + found = False ; + + while ((mnt = getmntent(fp)) != (struct mntent *) 0) { + if ( stat(mnt->mnt_dir,&S) == -1 ) + continue ; + if (S.st_dev == devno) { + found = True ; + break ; + } + } + endmntent(fp) ; + + if ( ! found ) + return(False) ; + + qcmd = QCMD(Q_GETQUOTA, USRQUOTA); + + if (hasmntopt(mnt, MNTOPT_NOAUTO) || hasmntopt(mnt, MNTOPT_NOQUOTA)) + return(False) ; + + if (!hasquota(mnt, USRQUOTA, &qfpathname)) + return(False) ; + + euser_id = geteuid(); + seteuid(0); + + if (quotactl(qcmd, mnt->mnt_fsname, euser_id, (caddr_t)&D) != 0) { + if ((fd = open(qfpathname, O_RDONLY)) < 0) { + seteuid(euser_id); + return(False); + } + lseek(fd, (long) dqoff(euser_id), L_SET); + switch (read(fd, &D, sizeof(struct dqblk))) { + case 0:/* EOF */ + memset((caddr_t)&D, 0, sizeof(struct dqblk)); + break; + case sizeof(struct dqblk): /* OK */ + break; + default: /* ERROR */ + close(fd); + seteuid(euser_id); + return(False); + } + } + seteuid(euser_id); + *bsize=1024; + + if (D.dqb_bsoftlimit==0) + return(False); + if ((D.dqb_curblocks>D.dqb_bsoftlimit)||(D.dqb_curinodes>D.dqb_isoftlimit)) + { + *dfree = 0; + *dsize = D.dqb_curblocks; + } + else { + *dfree = D.dqb_bsoftlimit - D.dqb_curblocks; + *dsize = D.dqb_bsoftlimit; + } + return (True); +} + +#elif defined(CRAY) +/**************************************************************************** +try to get the disk space from disk quotas (CRAY VERSION) +****************************************************************************/ +static BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) +{ + struct mntent *mnt; + FILE *fd; + struct stat sbuf; + dev_t devno ; + static dev_t devno_cached = 0 ; + static char name[MNTMAXSTR] ; + struct q_request request ; + struct qf_header header ; + static int quota_default = 0 ; + int found ; + + if ( stat(path,&sbuf) == -1 ) + return(False) ; + + devno = sbuf.st_dev ; + + if ( devno != devno_cached ) { + + devno_cached = devno ; + + if ((fd = setmntent(KMTAB)) == NULL) + return(False) ; + + found = False ; + + while ((mnt = getmntent(fd)) != NULL) { + + if ( stat(mnt->mnt_dir,&sbuf) == -1 ) + continue ; + + if (sbuf.st_dev == devno) { + + found = True ; + break ; + + } + + } + + strcpy(name,mnt->mnt_dir) ; + endmntent(fd) ; + + if ( ! found ) + return(False) ; + } + + request.qf_magic = QF_MAGIC ; + request.qf_entry.id = geteuid() ; + + if (quotactl(name, Q_GETQUOTA, &request) == -1) + return(False) ; + + if ( ! request.user ) + return(False) ; + + if ( request.qf_entry.user_q.f_quota == QFV_DEFAULT ) { + + if ( ! quota_default ) { + + if ( quotactl(name, Q_GETHEADER, &header) == -1 ) + return(False) ; + else + quota_default = header.user_h.def_fq ; + } + + *dfree = quota_default ; + + }else if ( request.qf_entry.user_q.f_quota == QFV_PREVENT ) { + + *dfree = 0 ; + + }else{ + + *dfree = request.qf_entry.user_q.f_quota ; + + } + + *dsize = request.qf_entry.user_q.f_use ; + + if ( *dfree ) + *dfree -= *dsize ; + + if ( *dfree < 0 ) + *dfree = 0 ; + + *bsize = 4096 ; /* Cray blocksize */ + + return(True) ; + +} + + +#elif defined(SUNOS5) + +#include <fcntl.h> +#include <sys/fs/ufs_quota.h> + +/**************************************************************************** +try to get the disk space from disk quotas (solaris 2 version) +****************************************************************************/ +/* Quota code by Peter Urbanec (amiga@cse.unsw.edu.au) */ +static BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) +{ + uid_t user_id, euser_id; + int r; + struct dqblk D; + struct quotctl command; + int file; + + if((file=open(path, O_RDONLY))<0) return(False); + + euser_id = geteuid(); + user_id = getuid(); + + setuid(0); /* Solaris seems to want to give info only to super-user */ + seteuid(0); + + command.op = Q_GETQUOTA; + command.uid = euser_id; + command.addr = (caddr_t) &D; + + if(ioctl(file, Q_QUOTACTL, &command)<0) + { + close(file); + DEBUG(2,("disk_quotas ioctl (Solaris) failed\n")); + return(False); + } + close(file); + + setuid(user_id); /* Restore the original UID status */ + seteuid(euser_id); + + /* Use softlimit to determine disk space. A user exceeding the quota is told + * that there's no space left. Writes might actually work for a bit if the + * hardlimit is set higher than softlimit. Effectively the disk becomes + * made of rubber latex and begins to expand to accommodate the user :-) + */ + + *bsize = 512; + *dfree = D.dqb_bsoftlimit - D.dqb_curblocks; + *dsize = D.dqb_bsoftlimit; + if(*dfree < 0) + { + *dfree = 0; + *dsize = D.dqb_curblocks; + } + +DEBUG(5,("disk_quotas for path \"%s\" returning bsize %d, dfree %d, dsize %d\n", + path,*bsize,*dfree,*dsize)); + + return(True); +} + +#else + +/**************************************************************************** +try to get the disk space from disk quotas - default version +****************************************************************************/ +static BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) +{ + uid_t user_id, euser_id; + int r; + char dev_disk[256]; + struct dqblk D; + struct stat S; + /* find the block device file */ + if ((stat(path, &S)<0) || + (devnm(S_IFBLK, S.st_dev, dev_disk, 256, 0)<0)) return (False); + + euser_id = geteuid(); + +#ifdef USE_SETRES + /* for HPUX, real uid must be same as euid to execute quotactl for euid */ + user_id = getuid(); + setresuid(euser_id,-1,-1); +#endif + r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D); + #ifdef USE_SETRES + if (setresuid(user_id,-1,-1)) + DEBUG(5,("Unable to reset uid to %d\n", user_id)); + #endif + /* Use softlimit to determine disk space, except when it has been exceeded */ + *bsize = 1024; + if (r) + { + if (errno == EDQUOT) + { + *dfree =0; + *dsize =D.dqb_curblocks; + return (True); + } + else return(False); + } + /* Use softlimit to determine disk space, except when it has been exceeded */ + if ((D.dqb_curblocks>D.dqb_bsoftlimit)||(D.dqb_curfiles>D.dqb_fsoftlimit)) + { + *dfree = 0; + *dsize = D.dqb_curblocks; + } + else { + *dfree = D.dqb_bsoftlimit - D.dqb_curblocks; + *dsize = D.dqb_bsoftlimit; + } + return (True); +} + +#endif +#endif diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/server.c samba-1.9.16alpha2/source/server.c --- samba-1.9.16alpha1/source/server.c Thu Feb 29 00:11:48 1996 +++ samba-1.9.16alpha2/source/server.c Mon May 6 10:35:46 1996 @@ -257,7 +257,7 @@ unixmode &= ~(S_IWUSR|S_IWGRP|S_IWOTH); unixmode |= tmp; } - + return(chmod(fname,unixmode)); } @@ -326,7 +326,7 @@ void *cur_dir; char *dname; BOOL mangled; - fstring name2; + pstring name2; mangled = is_mangled(name); @@ -410,8 +410,12 @@ { if ((! *name) || strchr(name,'/') || !is_8_3(name)) { + char *s; fstring name2; sprintf(name2,"%.6s.XXXXXX",remote_machine); + /* sanitise the name */ + for (s=name2 ; *s ; s++) + if (!issafe(*s)) *s = '_'; strcpy(name,(char *)mktemp(name2)); } return(True); @@ -522,251 +526,6 @@ } - - -#ifdef QUOTAS -#ifdef LINUX -/**************************************************************************** -try to get the disk space from disk quotas (LINUX version) -****************************************************************************/ -/* -If you didn't make the symlink to the quota package, too bad :( -*/ -#include "quota/quotactl.c" -#include "quota/hasquota.c" -static BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) -{ - uid_t euser_id; - struct dqblk D; - struct stat S; - dev_t devno ; - struct mntent *mnt; - FILE *fp; - int found ; - int qcmd, fd ; - char *qfpathname; - - /* find the block device file */ - - if ( stat(path, &S) == -1 ) - return(False) ; - - devno = S.st_dev ; - - fp = setmntent(MOUNTED,"r"); - found = False ; - - while ((mnt = getmntent(fp)) != (struct mntent *) 0) { - if ( stat(mnt->mnt_dir,&S) == -1 ) - continue ; - if (S.st_dev == devno) { - found = True ; - break ; - } - } - endmntent(fp) ; - - if ( ! found ) - return(False) ; - - qcmd = QCMD(Q_GETQUOTA, USRQUOTA); - - if (hasmntopt(mnt, MNTOPT_NOAUTO) || hasmntopt(mnt, MNTOPT_NOQUOTA)) - return(False) ; - - if (!hasquota(mnt, USRQUOTA, &qfpathname)) - return(False) ; - - euser_id = geteuid(); - seteuid(0); - - if (quotactl(qcmd, mnt->mnt_fsname, euser_id, (caddr_t)&D) != 0) { - if ((fd = open(qfpathname, O_RDONLY)) < 0) { - seteuid(euser_id); - return(False); - } - lseek(fd, (long) dqoff(euser_id), L_SET); - switch (read(fd, &D, sizeof(struct dqblk))) { - case 0:/* EOF */ - memset((caddr_t)&D, 0, sizeof(struct dqblk)); - break; - case sizeof(struct dqblk): /* OK */ - break; - default: /* ERROR */ - close(fd); - seteuid(euser_id); - return(False); - } - } - seteuid(euser_id); - *bsize=1024; - - if (D.dqb_bsoftlimit==0) - return(False); - if ((D.dqb_curblocks>D.dqb_bsoftlimit)||(D.dqb_curinodes>D.dqb_isoftlimit)) - { - *dfree = 0; - *dsize = D.dqb_curblocks; - } - else { - *dfree = D.dqb_bsoftlimit - D.dqb_curblocks; - *dsize = D.dqb_bsoftlimit; - } - return (True); -} -#else -#ifndef CRAY -/**************************************************************************** -try to get the disk space from disk quotas -****************************************************************************/ -static BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) -{ - uid_t user_id, euser_id; - int r; - char dev_disk[256]; - struct dqblk D; - struct stat S; - /* find the block device file */ - if ((stat(path, &S)<0) || - (devnm(S_IFBLK, S.st_dev, dev_disk, 256, 0)<0)) return (False); - - euser_id = geteuid(); - -#ifdef USE_SETRES - /* for HPUX, real uid must be same as euid to execute quotactl for euid */ - user_id = getuid(); - setresuid(euser_id,-1,-1); -#endif - r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D); - #ifdef USE_SETRES - if (setresuid(user_id,-1,-1)) - DEBUG(5,("Unable to reset uid to %d\n", user_id)); - #endif - /* Use softlimit to determine disk space, except when it has been exceeded */ - *bsize = 1024; - if (r) - { - if (errno == EDQUOT) - { - *dfree =0; - *dsize =D.dqb_curblocks; - return (True); - } - else return(False); - } - /* Use softlimit to determine disk space, except when it has been exceeded */ - if ((D.dqb_curblocks>D.dqb_bsoftlimit)||(D.dqb_curfiles>D.dqb_fsoftlimit)) - { - *dfree = 0; - *dsize = D.dqb_curblocks; - } - else { - *dfree = D.dqb_bsoftlimit - D.dqb_curblocks; - *dsize = D.dqb_bsoftlimit; - } - return (True); -} -#else -/**************************************************************************** -try to get the disk space from disk quotas (CRAY VERSION) -****************************************************************************/ -static BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) -{ - struct mntent *mnt; - FILE *fd; - struct stat sbuf; - dev_t devno ; - static dev_t devno_cached = 0 ; - static char name[MNTMAXSTR] ; - struct q_request request ; - struct qf_header header ; - static int quota_default = 0 ; - int found ; - - if ( stat(path,&sbuf) == -1 ) - return(False) ; - - devno = sbuf.st_dev ; - - if ( devno != devno_cached ) { - - devno_cached = devno ; - - if ((fd = setmntent(KMTAB)) == NULL) - return(False) ; - - found = False ; - - while ((mnt = getmntent(fd)) != NULL) { - - if ( stat(mnt->mnt_dir,&sbuf) == -1 ) - continue ; - - if (sbuf.st_dev == devno) { - - found = True ; - break ; - - } - - } - - strcpy(name,mnt->mnt_dir) ; - endmntent(fd) ; - - if ( ! found ) - return(False) ; - } - - request.qf_magic = QF_MAGIC ; - request.qf_entry.id = geteuid() ; - - if (quotactl(name, Q_GETQUOTA, &request) == -1) - return(False) ; - - if ( ! request.user ) - return(False) ; - - if ( request.qf_entry.user_q.f_quota == QFV_DEFAULT ) { - - if ( ! quota_default ) { - - if ( quotactl(name, Q_GETHEADER, &header) == -1 ) - return(False) ; - else - quota_default = header.user_h.def_fq ; - } - - *dfree = quota_default ; - - }else if ( request.qf_entry.user_q.f_quota == QFV_PREVENT ) { - - *dfree = 0 ; - - }else{ - - *dfree = request.qf_entry.user_q.f_quota ; - - } - - *dsize = request.qf_entry.user_q.f_use ; - - if ( *dfree ) - *dfree -= *dsize ; - - if ( *dfree < 0 ) - *dfree = 0 ; - - *bsize = 4096 ; /* Cray blocksize */ - - return(True) ; - -} -#endif /* CRAY */ -#endif /* LINUX */ -#endif /* QUOTAS */ - - /**************************************************************************** normalise for DOS usage ****************************************************************************/ @@ -1227,16 +986,6 @@ if (lp_share_modes(SNUM(cnum))) del_share_mode(fnum); - if (Files[fnum].modified) { - struct stat st; - if (fstat(Files[fnum].fd,&st) == 0) { - int dosmode = dos_mode(cnum,Files[fnum].name,&st); - if (!IS_DOS_ARCHIVE(dosmode)) { - dos_chmod(cnum,Files[fnum].name,dosmode | aARCH,&st); - } - } - } - close(Files[fnum].fd); /* NT uses smbclose to start a print - weird */ @@ -1609,7 +1358,16 @@ return(0); } - Files[fnum].modified = True; + if (!Files[fnum].modified) { + struct stat st; + Files[fnum].modified = True; + if (fstat(Files[fnum].fd,&st) == 0) { + int dosmode = dos_mode(Files[fnum].cnum,Files[fnum].name,&st); + if (MAP_ARCHIVE(Files[fnum].cnum) && !IS_DOS_ARCHIVE(dosmode)) { + dos_chmod(Files[fnum].cnum,Files[fnum].name,dosmode | aARCH,&st); + } + } + } return(write_data(Files[fnum].fd,data,n)); } @@ -2222,6 +1980,9 @@ signal(SIGPIPE, SIGNAL_CAST sig_pipe); signal(SIGCLD, SIGNAL_CAST SIG_DFL); #endif + /* close the listening socket */ + close(s); + /* close our standard file descriptors */ close_low_fds(); @@ -3989,10 +3750,15 @@ } if (keepalive && (counter-last_keepalive)>keepalive) { + extern int password_client; if (!send_keepalive(Client)) { DEBUG(2,("%s Keepalive failed - exiting\n",timestring())); return; - } + } + /* also send a keepalive to the password server if its still + connected */ + if (password_client != -1) + send_keepalive(password_client); last_keepalive = counter; } @@ -4277,22 +4043,23 @@ become_daemon(); } - if (open_sockets(is_daemon,port)) - { - /* possibly reload the services file. */ - reload_services(True); + if (!open_sockets(is_daemon,port)) + exit(1); - maxxmit = MIN(lp_maxxmit(),BUFFER_SIZE); + /* possibly reload the services file. */ + reload_services(True); - if (*lp_rootdir()) - { - if (sys_chroot(lp_rootdir()) == 0) - DEBUG(2,("%s changed root to %s\n",timestring(),lp_rootdir())); - } + maxxmit = MIN(lp_maxxmit(),BUFFER_SIZE); - process(); - close_sockets(); + if (*lp_rootdir()) + { + if (sys_chroot(lp_rootdir()) == 0) + DEBUG(2,("%s changed root to %s\n",timestring(),lp_rootdir())); } + + process(); + close_sockets(); + exit_server("normal exit"); return(0); } diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/status.c samba-1.9.16alpha2/source/status.c --- samba-1.9.16alpha1/source/status.c Mon Jan 15 18:39:50 1996 +++ samba-1.9.16alpha2/source/status.c Mon May 6 10:35:46 1996 @@ -33,6 +33,7 @@ struct connect_record crec; extern int DEBUGLEVEL; extern FILE *dbf; +extern pstring myhostname; static pstring Ucrit_username = ""; /* added by OH */ int Ucrit_pid[100]; /* Ugly !!! */ /* added by OH */ @@ -69,7 +70,7 @@ return(1); } - while ((c = getopt(argc, argv, "pdsu:")) != EOF) { + while ((c = getopt(argc, argv, "pds:u:")) != EOF) { switch (c) { case 'd': verbose = 1; @@ -89,13 +90,13 @@ } } - - if (!lp_load(servicesf,False)) { fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf); return (-1); } + get_myname(myhostname, NULL); + if (verbose) { printf("using configfile = %s\n", servicesf); printf("lockdir = %s\n", *lp_lockdir() ? lp_lockdir() : "NULL"); @@ -112,6 +113,9 @@ if (!lp_status(-1)) printf("You need to have status=yes in your smb config file\n"); return(0); + } + else if (verbose) { + printf("Opened status file %s\n", fname); } uid = getuid(); diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/system.c samba-1.9.16alpha2/source/system.c --- samba-1.9.16alpha1/source/system.c Sun Feb 18 17:46:50 1996 +++ samba-1.9.16alpha2/source/system.c Sun May 5 17:18:39 1996 @@ -79,7 +79,7 @@ return(found); } - if (tval && tval.tv_sec < counter) return(0); + if (tval && tval->tv_sec < counter) return(0); sleep(1); counter++; } diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/trans2.c samba-1.9.16alpha2/source/trans2.c --- samba-1.9.16alpha1/source/trans2.c Thu Feb 29 00:11:48 1996 +++ samba-1.9.16alpha2/source/trans2.c Mon May 6 10:35:46 1996 @@ -1444,7 +1444,7 @@ { int cnum; int outsize = 0; - uint16 dptr_num=SVAL(inbuf,smb_vwv0); + int16 dptr_num=SSVAL(inbuf,smb_vwv0); cnum = SVAL(inbuf,smb_tid); diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/util.c samba-1.9.16alpha2/source/util.c --- samba-1.9.16alpha1/source/util.c Thu Feb 29 00:11:48 1996 +++ samba-1.9.16alpha2/source/util.c Wed May 29 13:11:55 1996 @@ -151,6 +151,35 @@ /******************************************************************* +check if the log has grown too big +********************************************************************/ +static void check_log_size(void) +{ + static int debug_count=0; + int maxlog; + struct stat st; + + if (debug_count++ < 100) return; + + maxlog = lp_max_log_size() * 1024; + if (!dbf || maxlog <= 0) return; + + if (fstat(fileno(dbf),&st) == 0 && st.st_size > maxlog) { + fclose(dbf); dbf = NULL; + reopen_logs(); + if (dbf && file_size(debugf) > maxlog) { + pstring name; + fclose(dbf); dbf = NULL; + sprintf(name,"%s.old",debugf); + sys_rename(debugf,name); + reopen_logs(); + } + } + debug_count=0; +} + + +/******************************************************************* write an debug message on the debugfile. This is called by the DEBUG macro ********************************************************************/ @@ -165,44 +194,17 @@ #endif va_list ap; + if (stdout_logging) { #ifdef __STDC__ - va_start(ap, format_str); + va_start(ap, format_str); #else - va_start(ap); - format_str = va_arg(ap,char *); + va_start(ap); + format_str = va_arg(ap,char *); #endif - - if (stdout_logging) { vfprintf(dbf,format_str,ap); va_end(ap); return(0); } - - { - static int debug_count=0; - - debug_count++; - if (debug_count == 100) { - int maxlog = lp_max_log_size() * 1024; - if (dbf && maxlog > 0) - { - struct stat st; - - if (fstat(fileno(dbf),&st) == 0 && st.st_size > maxlog) { - fclose(dbf); dbf = NULL; - reopen_logs(); - if (dbf && file_size(debugf) > maxlog) { - pstring name; - fclose(dbf); dbf = NULL; - sprintf(name,"%s.old",debugf); - sys_rename(debugf,name); - reopen_logs(); - } - } - } - debug_count=0; - } - } #ifdef SYSLOG if (!lp_syslog_only()) @@ -241,7 +243,14 @@ else priority = priority_map[syslog_level]; +#ifdef __STDC__ + va_start(ap, format_str); +#else + va_start(ap); + format_str = va_arg(ap,char *); +#endif vsprintf(msgbuf, format_str, ap); + va_end(ap); msgbuf[255] = '\0'; syslog(priority, "%s", msgbuf); @@ -252,11 +261,19 @@ if (!lp_syslog_only()) #endif { +#ifdef __STDC__ + va_start(ap, format_str); +#else + va_start(ap); + format_str = va_arg(ap,char *); +#endif vfprintf(dbf,format_str,ap); + va_end(ap); fflush(dbf); } - - va_end(ap); + + check_log_size(); + return(0); } @@ -464,12 +481,11 @@ table_size++; - dst_table[i].is_dst = is_dst = (localtime(&t)->tm_isdst?True:False);; + dst_table[i].is_dst = is_dst = (localtime(&t)->tm_isdst?True:False); dst_table[i].start = dst_table[i].end = t; /* no entry will cover more than 6 months */ low = t - 3*30*24*60*60; - high = t + 3*30*24*60*60; /* widen the new entry using two bisection searches */ while (low+60*60 < dst_table[i].start) { @@ -480,8 +496,9 @@ low = t; } + high = low + 3*30*24*60*60; while (high-60*60 > dst_table[i].end) { - t = high + (high-dst_table[i].end)/2; + t = high - (high-dst_table[i].end)/2; if ((localtime(&t)->tm_isdst?True:False) == is_dst) dst_table[i].end = t; else diff -u -r --new-file --exclude=CVS samba-1.9.16alpha1/source/version.h samba-1.9.16alpha2/source/version.h --- samba-1.9.16alpha1/source/version.h Thu Feb 29 00:22:55 1996 +++ samba-1.9.16alpha2/source/version.h Wed May 29 14:35:23 1996 @@ -1 +1 @@ -#define VERSION "1.9.16alpha1" +#define VERSION "1.9.16alpha2"